Require opt-in to use alternative Python implementations #7650

zanieb · 2024-09-23T23:40:10Z

This only really affects managed interpreters, as we exclude alternative Python implementations from the search path during the VersionRequest::executable_names part of discovery.

crates/uv-python/src/discovery.rs

zanieb · 2024-09-23T23:41:32Z

crates/uv-python/src/lib.rs

@@ -1793,7 +1793,7 @@ mod tests {
 })?;


Note we don't have test coverage for this because we don't test Python discovery with managed interpreters. I'll create an issue to track infrastructure for this.

charliermarsh · 2024-09-24T01:01:09Z

crates/uv-python/src/discovery.rs

+ pub(crate) fn allows_alternative_implementations(&self) -> bool {
+ match self {
+ Self::Default => false,
+ Self::Any => true,


Why is Any true but (e.g.) Version and Default false?

Per #7526 we want to distinguish between discovery that allows any interpreter and discovery of a good default interpreter. Any should never filter an interpreter. Default filters alternative implementations because they require opt-in. Version filters alternative implementations because asking for 3.13 isn't enough to select PyPy, we need pypy@3.13 which is ImplementationVersion.

crates/uv-python/src/discovery.rs

crates/uv-python/src/implementation.rs

crates/uv-python/src/installation.rs

charliermarsh · 2024-09-24T01:04:10Z

crates/uv-python/src/discovery.rs

+ && !installation.source.allows_alternative_implementations()
+ // Installing an alternative implementation with a default executable name is opt-in
+ && !(installation.interpreter.has_default_executable_name()
+ && installation.source == PythonSource::SearchPath)


I think I need this part explained. This is, like, if the executable is named python but it's really PyPy?

Yes, if you have PyPy on the front of your PATH as python or python3 that counts as opting in, to fulfill the principle that $ python and $ uv python find --python-preference only-system should generally use the same executable.

I futzed with the commentary and implementation here a fair bit. I would kind of like to track the executable name on PythonSource::SearchPath and implement this logic in PythonSource::allows_alternative_implementations() but that would be fairly disruptive.

charliermarsh · 2024-09-24T17:28:00Z

crates/uv-python/src/discovery.rs

+ // If the interpreter has a default executable name, e.g. `python`, and was found on the
+ // search path, we consider this opt-in to use it.
+ let has_default_executable_name = installation.interpreter.has_default_executable_name()
+ && installation.source == PythonSource::SearchPath;


Oh ok, this makes sense, comment is helpful.

charliermarsh · 2024-09-24T17:28:31Z

crates/uv-python/src/discovery.rs

 if installation.python_version().pre().is_some()
 && !request.allows_prereleases()
 && !installation.source.allows_prereleases()
+ && !has_default_executable_name
 {
 debug!("Skipping pre-release {}", installation.key());
 first_prerelease = Some(installation.clone());


Does this need to be under if first_prerelease.is_none(), so we don't set it repeatedly?

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.4.15` -> `0.4.18` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>astral-sh/uv (astral-sh/uv)</summary> ### [`v0.4.18`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0418) [Compare Source](astral-sh/uv@0.4.17...0.4.18) ##### Enhancements - Allow multiple source entries for each package in `tool.uv.sources` ([#7745](astral-sh/uv#7745)) - Add `.gitignore` file to `uv build` output directory ([#7835](astral-sh/uv#7835)) - Disable jemalloc on FreeBSD ([#7780](astral-sh/uv#7780)) - Respect `PAGER` env var when paging in `uv help` command ([#5511](astral-sh/uv#5511)) - Support `uv run -m foo` to run a module ([#7754](astral-sh/uv#7754)) - Use a top-level output directory for `uv build` in workspaces ([#7813](astral-sh/uv#7813)) - Update `uv init --package` command to match project name ([#7670](astral-sh/uv#7670)) - Add a custom suggestion for `uv add dotenv` ([#7799](astral-sh/uv#7799)) - Add detailed errors for `tool.uv.sources` deserialization failures ([#7823](astral-sh/uv#7823)) - Improve error message copy for failed builds ([#7849](astral-sh/uv#7849)) - Use `serde-untagged` to improve some untagged enum error messages ([#7822](astral-sh/uv#7822)) - Use build failure hints for `dotenv` errors, rather than in `uv add` ([#7825](astral-sh/uv#7825)) ##### Configuration - Add `UV_NO_SYNC` environment variable ([#7752](astral-sh/uv#7752)) ##### Bug fixes - Accept `git+` prefix in `tool.uv.sources` ([#7847](astral-sh/uv#7847)) - Allow spaces in path requirements ([#7767](astral-sh/uv#7767)) - Avoid reusing cached downloaded binaries with `--no-binary` ([#7772](astral-sh/uv#7772)) - Correctly trims values during wheel WHEEL file parsing ([#7770](astral-sh/uv#7770)) - Fix `uv tree --invert` for platform dependencies ([#7808](astral-sh/uv#7808)) - Fix encoding mismatch between python child process and uv ([#7757](astral-sh/uv#7757)) - Reject self-dependencies in `uv add` ([#7766](astral-sh/uv#7766)) - Respect `tool.uv.environments` for legacy virtual workspace roots ([#7824](astral-sh/uv#7824)) - Retain empty extras on workspace members ([#7762](astral-sh/uv#7762)) - Use file stem when parsing cached wheel names ([#7773](astral-sh/uv#7773)) ##### Rust API - Make `FlatDistributions` public ([#7833](astral-sh/uv#7833)) ##### Documentation - Fix table of contents sizing ([#7751](astral-sh/uv#7751)) - GitLab Integration documentation ([#6857](astral-sh/uv#6857)) - Update documentation to setup-uv@v3 ([#7807](astral-sh/uv#7807)) - Use `uv publish` instead of twine in docs ([#7837](astral-sh/uv#7837)) - Fix typo in `projects.md` ([#7784](astral-sh/uv#7784)) ### [`v0.4.17`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0417) [Compare Source](astral-sh/uv@0.4.16...0.4.17) ##### Enhancements - Add `uv build --all` to build all packages in a workspace ([#7724](astral-sh/uv#7724)) - Add support for `uv init --script` ([#7565](astral-sh/uv#7565)) - Add support for upgrading build environment for installed tools (`uv tool upgrade --python`) ([#7605](astral-sh/uv#7605)) - Initialize a Git repository in `uv init` ([#5476](astral-sh/uv#5476)) - Respect `--quiet` flag in `uv build` ([#7674](astral-sh/uv#7674)) - Add context message before listing available tools in `uvx` ([#7641](astral-sh/uv#7641)) ##### Bug fixes - Don't create Python bytecode files during interpreter discovery ([#7707](astral-sh/uv#7707)) - Escape glob patterns in workspace member discovery ([#7709](astral-sh/uv#7709)) - Avoid prefetching source distributions with unbounded lower-bound ranges ([#7683](astral-sh/uv#7683)) ##### Documentation - Add `uv build` and `uv publish` to features overview ([#7716](astral-sh/uv#7716)) - Add documentation on cache versioning ([#7693](astral-sh/uv#7693)) - Spell out the names of the Docker images for easier copy-paste ([#7706](astral-sh/uv#7706)) - Document uv-with-Jupyter workflows ([#7625](astral-sh/uv#7625)) - Note that `uv lock --upgrade-package` retains locked versions ([#7694](astral-sh/uv#7694)) ### [`v0.4.16`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0416) [Compare Source](astral-sh/uv@0.4.15...0.4.16) ##### Enhancements - Add `uv publish` ([#7475](astral-sh/uv#7475)) - Add a `--project` argument to run a command from a project directory ([#7603](astral-sh/uv#7603)) - Display Python implementation when creating environments ([#7652](astral-sh/uv#7652)) - Implement trusted publishing for `uv publish` ([#7548](astral-sh/uv#7548)) - Respect lockfile preferences for `--with` requirements ([#7627](astral-sh/uv#7627)) - Unhide the `--directory` option ([#7653](astral-sh/uv#7653)) - Allow requesting free-threaded Python interpreters ([#7431](astral-sh/uv#7431)) - Show a dedicated PubGrub hint for `--unsafe-best-match` ([#7645](astral-sh/uv#7645)) - Add resolver error checking for conflicting distributions ([#7595](astral-sh/uv#7595)) ##### Bug fixes - Avoid adding double-newlines for CRLF ([#7640](astral-sh/uv#7640)) - Avoid retaining forks when `requires-python` range changes ([#7624](astral-sh/uv#7624)) - Determine if pre-release Python downloads should be allowed using the version specifiers ([#7638](astral-sh/uv#7638)) - Fix `link-mode=clone` for directories on Linux ([#7620](astral-sh/uv#7620)) - Improve Python executable name discovery when using alternative implementations ([#7649](astral-sh/uv#7649)) - Require opt-in to use alternative Python implementations ([#7650](astral-sh/uv#7650)) - Use the first pre-release discovered when only pre-release Python versions are available ([#7666](astral-sh/uv#7666)) ##### Documentation - Document environment variable that disables printing of virtual environment name in prompt ([#7648](astral-sh/uv#7648)) - Remove double whitespaces from the code ([#7623](astral-sh/uv#7623)) - Use anchorlinks rather than permalinks ([#7626](astral-sh/uv#7626)) ##### Preview features - Add build backend scaffolding ([#7662](astral-sh/uv#7662)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

zanieb added the bug Something isn't working label Sep 23, 2024

zanieb commented Sep 23, 2024

View reviewed changes

crates/uv-python/src/discovery.rs Outdated Show resolved Hide resolved

zanieb commented Sep 23, 2024

View reviewed changes

zanieb requested a review from charliermarsh September 24, 2024 00:18

charliermarsh reviewed Sep 24, 2024

View reviewed changes

crates/uv-python/src/discovery.rs Outdated Show resolved Hide resolved

charliermarsh reviewed Sep 24, 2024

View reviewed changes

crates/uv-python/src/implementation.rs Outdated Show resolved Hide resolved

charliermarsh reviewed Sep 24, 2024

View reviewed changes

crates/uv-python/src/installation.rs Outdated Show resolved Hide resolved

charliermarsh reviewed Sep 24, 2024

View reviewed changes

zanieb force-pushed the zb/pypy-managed branch 3 times, most recently from 7e5e15d to b7524ed Compare September 24, 2024 13:32

zanieb requested a review from charliermarsh September 24, 2024 16:45

zanieb force-pushed the zb/pypy-managed branch from b7524ed to f2bf844 Compare September 24, 2024 16:59

zanieb temporarily deployed to uv-test-publish September 24, 2024 17:02 — with GitHub Actions Inactive

Require opt-in to use alternative Python implementations

04f50a9

zanieb force-pushed the zb/pypy-managed branch from f2bf844 to 04f50a9 Compare September 24, 2024 17:25

zanieb temporarily deployed to uv-test-publish September 24, 2024 17:27 — with GitHub Actions Inactive

charliermarsh reviewed Sep 24, 2024

View reviewed changes

charliermarsh approved these changes Sep 24, 2024

View reviewed changes

zanieb merged commit a53ddaa into main Sep 24, 2024
60 checks passed

zanieb deleted the zb/pypy-managed branch September 24, 2024 17:52

BrewTestBot mentioned this pull request Sep 24, 2024

uv 0.4.16 Homebrew/homebrew-core#191807

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Require opt-in to use alternative Python implementations #7650

Require opt-in to use alternative Python implementations #7650

zanieb commented Sep 23, 2024 •

edited

Loading

zanieb Sep 23, 2024

charliermarsh Sep 24, 2024

zanieb Sep 24, 2024

charliermarsh Sep 24, 2024

zanieb Sep 24, 2024 •

edited

Loading

zanieb Sep 24, 2024 •

edited

Loading

charliermarsh Sep 24, 2024

charliermarsh Sep 24, 2024

zanieb Sep 24, 2024

Require opt-in to use alternative Python implementations #7650

Require opt-in to use alternative Python implementations #7650

Conversation

zanieb commented Sep 23, 2024 • edited Loading

zanieb Sep 23, 2024

Choose a reason for hiding this comment

charliermarsh Sep 24, 2024

Choose a reason for hiding this comment

zanieb Sep 24, 2024

Choose a reason for hiding this comment

charliermarsh Sep 24, 2024

Choose a reason for hiding this comment

zanieb Sep 24, 2024 • edited Loading

Choose a reason for hiding this comment

zanieb Sep 24, 2024 • edited Loading

Choose a reason for hiding this comment

charliermarsh Sep 24, 2024

Choose a reason for hiding this comment

charliermarsh Sep 24, 2024

Choose a reason for hiding this comment

zanieb Sep 24, 2024

Choose a reason for hiding this comment

zanieb commented Sep 23, 2024 •

edited

Loading

zanieb Sep 24, 2024 •

edited

Loading

zanieb Sep 24, 2024 •

edited

Loading